Merge remote-tracking branch 'savannah/master' into HEAD

author Andrea Corallo <akrl@sdf.org>

Wed, 14 Oct 2020 09:04:55 +0000 (11:04 +0200)

committer Andrea Corallo <akrl@sdf.org>

Wed, 14 Oct 2020 09:04:55 +0000 (11:04 +0200)
author Andrea Corallo <akrl@sdf.org>
Wed, 14 Oct 2020 09:04:55 +0000 (11:04 +0200)
committer Andrea Corallo <akrl@sdf.org>
Wed, 14 Oct 2020 09:04:55 +0000 (11:04 +0200)
diff --cc lisp/emacs-lisp/package.el
Simple merge
diff --cc lisp/help-fns.el
Simple merge
diff --cc lisp/help.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/emacs.c
Simple merge
author	Andrea Corallo <akrl@sdf.org>
	Wed, 14 Oct 2020 09:04:55 +0000 (11:04 +0200)
committer	Andrea Corallo <akrl@sdf.org>
	Wed, 14 Oct 2020 09:04:55 +0000 (11:04 +0200)
		1	2
lisp/emacs-lisp/package.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/help-fns.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/help.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/emacs.c	patch \|	diff1 \|	diff2 \|	blob \| history